Final standalone fix