@Mamute: Fixes #74 (second attempt).