Fixed a bug where the X10 stuff wasn't working correctly