Fixed changes asked by Bronston