Fix for 1234

Paul could you please review this before I merge to Master