Less efficient version...
Fix