Reverting last commit. Behaviour was incorrect.