Resolves fix# 1