Applied @jguitar 's PR suggestion