Fix for timotimo++ 's fixes