Fix for potential bug