Fixed rough edges (for real this time)