fix and make disableable