FIX: issue #34