bala-dev bugfix