US534 - Fix stupid bug