Patches for Issues #254 and #255