Fix for Piotr