Fixed 1.9.3 compatbility issues