@Mamute: Fixes #130 (second attempt).