added workaround from mailing list