Fixed the fuck out of #67!