OK. Please open an issue on this (in case its not going into this PR). Otherwise we will forget it.