BC-1820 #comment fixed nullable for amount