BUG-FIX: fixes #59