fixed after input-module trashes.
Refractoring
Yeah... news...