Fix issue #54

More a workaround than a fix but I don't have a better idea right now...