Should now work perfectly in all cases