Use different method to fix this