Adds back the necessary bugfix from previous commit "01f8364" that were accidentally...