Patch requested by Bjoern