Astonish myself if this actually fixes the problem