Another bugfix related with last commit