Fast critical bug fix for #49