Trying to get around the patch 0004 problem