Starting to address #619