Closes #487

#487