Framework patch / thanks @munjeni