quick & dirty fix #19