Updated for NetBeans 7.4