Fixed following David's suggestions