Fix for KNIFE-285