[fixes #34]