Note todo with patch attached to solve listed problem