Fixed a slight security issue, not tidy but a temp fix