Fixes bugs (not in a neat way)
Fixes bugs (not in a neat way)

rbecheras/challengesplatform,rbecheras/challengesplatform,boersmamarcel/challengesplatform,boersmamarcel/challengesplatform,boersmamarcel/challengesplatform,rbecheras/challengesplatform,rbecheras/challengesplatform