Fix for #81: My "fix" (it's not a good fix... it's option B in my bugreport)

#81