Improved security - thanks to @Stevie from LET