Fix for Patryk's delegate code