domenik's fixes