Fix for #121 in stable