Applying same fix from * to other methods.