Resolved #24