Additional code related to previous bugfix.