Fixed resolver bug