Fix non-standard bind behaviour