Fixes for the new method