APS: bugfix, separation of features

![image](https://f.cloud.github.com/assets/5043885/1507493/ce14e7ea-4985-11e3-8d1d-036abc8baabf.png)