Quick fix for annoyance #101 (issues)