Fixed bug in fix for #17