Give credit to astjohn for bugfix