Once again fixes bug