bug fix for hardcoded shape types