fixed issues with sipplan