marcinant fix for Issue #3