Fixed the fuck out of #486!