Patch attached. --Bartosz