Fixed bad merge

Signed-off-by: Nick Brook <nick@rmpenterprise.co.uk>