Resolved #49