Fixes #1 by always tracking x position