Fix to from bug (still needs to be refined tho)