some buxfix - many thanks to qitta!