Working on #617

#617