bugfixing (empty data)