Phew! Finally completed the fix for #258