@jmikola you are right. Take a look at dc5a3b5

Let me know when you have time to discuss.