[fixes #521]