Removed static creating issues with gcc