hot fix for coming 0.5.3