@jurgelenas will be glad to see this change