Resolved comments of #56