Fix bug (properly)