Fixes for the problem