Fix to right calculations so you can keep cliking #24