Fix based on @wilsonge comment