#25 another fix (pbo)