Fixed the #20 issue