fixed for bs3; kltm/amigo#104; #26