Simple fix for the current bugs