Resolved issue27