Fixed Bugs that caused crash with the Bank