RAM usage fix

uses #33 to fix RAM usage bug.
This code safes 900 Bytes in RAM!