Removed init hack