Andreas' fix