Fixing Spring bean issue