future bugs fixed