Bug fix (the savior commit)