bugfix after nopolymodel branch merge