Issue#525

solves #525