Possible fix for last commit