Resolved #46