Resolved issue #52