actually fixes bug this time