Fix for #84 which was caused by #83