FIX: issue #3