Small bug to remove. TODO later