Issue#526

solves #526