Resolved #307