Fixed the fuck out of #360!

1082