Fixing alpha stuff (not on tests)