Fixed the #19 bug