Fixed the %-bug for real