fixes for decorator