Resolved #48