quick & dirty workaround