Optimising code by using eager fetching instead of lazy evaluation as necessary
bug fix