bugfixes for billboard