Removing fix for #15

false/dead bug