Patch 248 and more