Created #502 to address this