Fixes problems with last implementation