BTW, should you find a more elegant fix, please let me know!