Removal of white spaces etc.
Fix for APC bug