Fixes #6: Less flashiness