PB-752 #comment Trying to fix problems with implementation of specifications