Fix enum class value conversion for storing last locations

See issue #3949.