This version fixes the following bug: