Incorporated solution by @adriaanm.