Fixing #525

Suggestion to fix #525