Providing bug fix for #61
Updates #61