Fix for the previous commits