Fixed the fuck out of #506!