Fix/loan controller