Variables were not resolved in most cases, fixed that (and for too)