Fixed
Merge branch 'BUG#574'