See my suggestion here