Fix the #36 issue