Fixed eager loading, issue #138