it's a good temp fix. let's merge it and then i'll improve it a bit