Fixed #BT-13