#231 qulice violation fixed
#231 one more qulice violation
#231 one last fix