[WIP] Bug fix #574