Bug fix previous commit (maybe...)