Fix for being to rigorous