FIXED: parse error (oops, this commit went too fast :/)
CLEANED-UP: removed useless behavior