Fixed the fuck out of #526!