FIX: #1 bugfix. Along with adding support for both 'A' & 'E' directive types.