Fixed annoying bug with lazy arguments