Fix for shitty features