Attempt at #1956

forgive me for stupid mistakes