added workaround code