FIXED: issue #1