Fixed errors with which N used in policies
Merge branches 'bugfix' and 'master'