allan87 fix